From 1c9d02b48deeeab5f195748ed88f684244b02147 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Wed, 3 Sep 2003 20:05:04 +0000 Subject: [PATCH] Merge from stable. Wed Sep 3 21:58:03 2003 Kristian Rietveld Merge from stable. * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL, unref it. (Fixes memleak, patch from Kjartan Maraas). --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkiconfactory.c | 3 +++ 6 files changed, 38 insertions(+) diff --git a/ChangeLog b/ChangeLog index 658467f458..59f0fe0ab2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Sep 3 21:58:03 2003 Kristian Rietveld + + Merge from stable. + + * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL, + unref it. (Fixes memleak, patch from Kjartan Maraas). + Wed Sep 3 21:38:26 2003 Kristian Rietveld * gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 658467f458..59f0fe0ab2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Sep 3 21:58:03 2003 Kristian Rietveld + + Merge from stable. + + * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL, + unref it. (Fixes memleak, patch from Kjartan Maraas). + Wed Sep 3 21:38:26 2003 Kristian Rietveld * gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 658467f458..59f0fe0ab2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Sep 3 21:58:03 2003 Kristian Rietveld + + Merge from stable. + + * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL, + unref it. (Fixes memleak, patch from Kjartan Maraas). + Wed Sep 3 21:38:26 2003 Kristian Rietveld * gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 658467f458..59f0fe0ab2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Sep 3 21:58:03 2003 Kristian Rietveld + + Merge from stable. + + * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL, + unref it. (Fixes memleak, patch from Kjartan Maraas). + Wed Sep 3 21:38:26 2003 Kristian Rietveld * gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 658467f458..59f0fe0ab2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Sep 3 21:58:03 2003 Kristian Rietveld + + Merge from stable. + + * gtk/gtkiconfactory.c (cached_icon_free): if icon->style != NULL, + unref it. (Fixes memleak, patch from Kjartan Maraas). + Wed Sep 3 21:38:26 2003 Kristian Rietveld * gdk/Makefile.am, gdk/linux-fb/gdkfbmanager.c, gdk/x11/gdkcolor-x11.c, diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 55376d177b..75e74ac121 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -2522,6 +2522,9 @@ cached_icon_free (CachedIcon *icon) { g_object_unref (icon->pixbuf); + if (icon->style) + g_object_unref (icon->style); + g_free (icon); } -- 2.30.2